Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial move to using twirl for template parsing. #217

Merged
merged 1 commit into from
Jul 22, 2014

Conversation

dragos
Copy link
Member

@dragos dragos commented Jul 17, 2014

Review, let's merge!

Initial work for moving off of Play dependencies and using twirl instead. Twirl is cross-compiled and will allow us to move freely on different Scala versions independent of Play.

Fixed tests for 2.11, see commit message.

@ghprb-bot
Copy link

Test FAILed.
Refer to this link for build results: https://jenkins.scala-ide.org:8496/jenkins/job/ghprb-play-validator/25/

target/lib/scala-io-file.jar,
target/lib/templates.jar
target/lib/scala-io-core_2.11.jar,
target/lib/scala-io-file_2.11.jar,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Scala.IO dependency is commented out, we probably can remove it here as well.

@dragos
Copy link
Member Author

dragos commented Jul 22, 2014

This passes tests on 2.11 on my machine, looking forward to a review! /cc @huitseeker

@ghprb-bot
Copy link

Test PASSed.
Refer to this link for build results: https://jenkins.scala-ide.org:8496/jenkins/job/ghprb-play-validator/27/

@ghprb-bot
Copy link

Test PASSed.
Refer to this link for build results: https://jenkins.scala-ide.org:8496/jenkins/job/ghprb-play-validator/28/

@@ -4,5 +4,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="target/lib/mockito-all-1.9.0.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/twirl-compiler.jar"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure the 'exported' is interesting for tests ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, I'll remove it

@huitseeker
Copy link
Member

This LGTM !

Fixed tests that started failing under 2.11.

* added a strategic `initialize` call before checking `.isAbstractClass`, since
  flags weren’t there yet
* made the stub `play.mvc.Result` a proper public class (default visibility in
  Java is package private). The 2.11 compiler correctly failed those tests.
@ghprb-bot
Copy link

Test PASSed.
Refer to this link for build results: https://jenkins.scala-ide.org:8496/jenkins/job/ghprb-play-validator/29/

@huitseeker
Copy link
Member

This looks very good ! Templates look pruutty
template
(Note to self : we may want, someday, to reorganize editor choice menus in the plugin)

Next step : #216

@dragos
Copy link
Member Author

dragos commented Jul 22, 2014

@huitseeker, definitely... is there a ticket for that?

dragos added a commit that referenced this pull request Jul 22, 2014
Initial move to using twirl for template parsing.
@dragos dragos merged commit 44bca32 into scala-ide:master Jul 22, 2014
@dragos dragos deleted the move-to-twirl branch July 22, 2014 14:57
@huitseeker
Copy link
Member

@dragos Yes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants